[Explore Feed] Preference Selection #6502
Open
Williamrai wants to merge 55 commits intoexplore-feed-upgrade-designfrom
Open
[Explore Feed] Preference Selection #6502Williamrai wants to merge 55 commits intoexplore-feed-upgrade-designfrom
Williamrai wants to merge 55 commits intoexplore-feed-upgrade-designfrom
Conversation
- adds interest onboarding related screens - adds string resources
- adds state models - adds viewModel and interest placeholder screen
# Conflicts: # app/src/main/res/values-qq/strings.xml # app/src/main/res/values/strings.xml
…o ef-interest # Conflicts: # app/src/main/java/org/wikipedia/onboarding/InitialOnboardingActivity.kt
- code fixes
…o ef-interest # Conflicts: # app/src/main/res/values-qq/strings.xml
…o ef-interest # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/res/values-qq/strings.xml # app/src/main/res/values/strings.xml
- moves view to its own composable functions - adds string resource - code fixes
- adds topics - code fixes
…o ef-interest # Conflicts: # app/src/main/java/org/wikipedia/onboarding/InitialOnboardingActivity.kt # app/src/main/res/values-qq/strings.xml # app/src/main/res/values/strings.xml
- code fixes
- adds deleteAllByType query - adds viewModelFactory to PersonalizationViewModel.kt - code fixes and cleanups
- writes DAO for article and topic interest - update PersonalizationViewModel.kt and PersonalizationRepository.kt - updates SelectionBottomBar to use count of both article and topics - code fixes
- adds job in PersonalizationViewModel.kt - code fixes
- update article and topic interest dao - code fixes
- renames article and topic interest table
- adds string resource - adds autoSize parameter to HtmlText
# Conflicts: # app/src/main/java/org/wikipedia/feed/personalization/FeedPreferenceScreen.kt
- adds FeedPreferenceRepository and FeedPreferenceState
# Conflicts: # app/src/main/java/org/wikipedia/feed/personalization/PersonalizationViewModel.kt
…o ef-onboarding-preference # Conflicts: # app/src/main/java/org/wikipedia/feed/HomeFragment.kt # app/src/main/java/org/wikipedia/feed/personalization/PersonalizationScreen.kt # app/src/main/java/org/wikipedia/feed/personalization/PersonalizationViewModel.kt # app/src/main/java/org/wikipedia/feed/personalization/interest/InterestSelectionState.kt # app/src/main/java/org/wikipedia/onboarding/InitialOnboardingActivity.kt # app/src/main/res/values-qq/strings.xml # app/src/main/res/values/strings.xml
… using getArticlesWithTopic function - adds loadFeedPreferenceScreen - adds dev settings for selecting feed preference type - code/ui fixes
- removes db query to get articleWithTopic
Williamrai
added
Ready for Review
WIP
- cache is only applied for topics - code fixes
cooltey
requested changes
Apr 20, 2026
Comment on lines
+12
to
+30
| data class FeedPreferenceContent ( | ||
| val title: String?, | ||
| val description: String?, | ||
| val imageUrl: String?, | ||
| val tag: String? | ||
| ) { | ||
| companion object { | ||
| fun fromPageTitles(pageTitles: List<PageTitle>, topic: OnboardingTopic): List<FeedPreferenceContent> { | ||
| return pageTitles.map { page -> | ||
| FeedPreferenceContent( | ||
| title = page.displayText, | ||
| description = page.description, | ||
| imageUrl = page.thumbUrl, | ||
| tag = topic.displayTitle | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } |
Collaborator
There was a problem hiding this comment.
Maybe we can reuse PageTitle class and assign topic.displayTitle to extract.
Collaborator
Author
There was a problem hiding this comment.
I am not sure I understand, Could you clarify what you mean?
Collaborator
There was a problem hiding this comment.
Instead of creating a new data class, I think it's fine to just use PageTitle and treat extract as the tag in this case.
Comment on lines
+255
to
+256
| HtmlText( | ||
| text = content.title, |
Collaborator
There was a problem hiding this comment.
When my primary language code is zh-tw, the articles' titles in the interest selection are correct, but when it pops up in the preference screen, the titles are in the incorrect language variant.
This happens when I don't have any topic selected and only select articles.
Comment on lines
384
to
397
| PersonalizationViewModel( | ||
| interestSelectionRepository = InterestSelectionRepository( | ||
| interestTopicDao = AppDatabase.instance.topicInterestDao(), | ||
| interestArticleDao = AppDatabase.instance.articleInterestDao(), | ||
| historyEntryWithImageDao = AppDatabase.instance.historyEntryWithImageDao(), | ||
| readingListPageDao = AppDatabase.instance.readingListPageDao(), | ||
| wikiSite = WikipediaApp.instance.wikiSite | ||
| ), | ||
| feedPreferenceRepository = FeedPreferenceRepository( | ||
| context = WikipediaApp.instance, | ||
| historyEntryWithImageDao = AppDatabase.instance.historyEntryWithImageDao(), | ||
| wikiSite = WikipediaApp.instance.wikiSite | ||
| ) | ||
| ) |
Collaborator
There was a problem hiding this comment.
Maybe we can have local variables for WikipediaApp.instance and AppDatabase.instance.
Collaborator
Author
There was a problem hiding this comment.
Do you mean like this or inside the repository?
initializer {
val appDatabase = AppDatabase.instance
val instance = WikipediaApp.instance
PersonalizationViewModel(
interestSelectionRepository = InterestSelectionRepository(
interestTopicDao = AppDatabase.instance.topicInterestDao(),
interestArticleDao = AppDatabase.instance.articleInterestDao(),
historyEntryWithImageDao = AppDatabase.instance.historyEntryWithImageDao(),
readingListPageDao = AppDatabase.instance.readingListPageDao(),
wikiSite = WikipediaApp.instance.wikiSite
),
homePreferenceRepository = HomePreferenceRepository(
context = WikipediaApp.instance,
historyEntryWithImageDao = AppDatabase.instance.historyEntryWithImageDao(),
wikiSite = WikipediaApp.instance.wikiSite
)
)
}
Collaborator
There was a problem hiding this comment.
Yes, and use appDatabase.topicInterestDao()...etc below.
- code fixes
# Conflicts: # app/src/main/java/org/wikipedia/settings/Prefs.kt # app/src/main/res/values-qq/strings.xml # app/src/main/res/values/preference_keys.xml # app/src/main/res/values/strings.xml
cooltey
reviewed
Apr 21, 2026
| val response = ServiceFactory.get(wikiSite).searchMoreLike(searchTerm = moreLikeSearchTerm, gsrLimit = 3, piLimit = 3) | ||
| return response.query?.pages?.map { page -> | ||
| HomePreferenceContent( | ||
| title = page.title, |
Collaborator
There was a problem hiding this comment.
This should use page.displayTitle(wikiSite.languageCode) instead of page.title, and that's why I suggested using PageTitle so you won't get confused.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this do?
Phabricator:
https://phabricator.wikimedia.org/T418781